Minor code hygeine in stmsdf and overlay.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4730 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/magproto.cc b/gpsbabel/magproto.cc
index 7c53a3591137cba113de44b2e8485ea5c59326db..103c6eba1a04fd2262540ce872d080ec30ee9c92 100644 (file)
--- a/gpsbabel/magproto.cc
+++ b/gpsbabel/magproto.cc
@@ -1530,7 +1530,7 @@ mag_route_trl(const route_head* rte)
   Waypoint* waypointp;
   char obuff[256];
   char buff1[64], buff2[64];
-  char* pbuff, *owpt;
+  char* pbuff;
   QString icon_token;
   int i, numlines, thisline;
 

diff --git a/gpsbabel/overlay.cc b/gpsbabel/overlay.cc
index 55e1ba01ecd155488450e26509ccfebb6942dfde..b0a6b77ce18e92ea60039e2dd2bac6a2d978b887 100644 (file)
--- a/gpsbabel/overlay.cc
+++ b/gpsbabel/overlay.cc
@@ -308,7 +308,10 @@ static void ovl_read(void)
             break;
           case KEY_AREA     :
             aktArea = atoi(pstr);
-            if (aktTyp==5 || aktTyp==5 || aktTyp==7) {
+            // 2014-02-11.  This code originally tested five twice.
+            // I changed it to test 5, 6, and 7 as that was "obviously"
+            // the author's intent.
+            if (aktTyp == 5 || aktTyp == 6 || aktTyp == 7) {
               isSection = SECTION_PUNKTE;  // Rechteck, Kreis, Dreieck
             }
             break;

diff --git a/gpsbabel/stmsdf.cc b/gpsbabel/stmsdf.cc
index 5b9c630feb767c31e84683bec6b0a513b14b66c4..9e63c0562e94ced4dee652a6553b05fc2ec2b998 100644 (file)
--- a/gpsbabel/stmsdf.cc
+++ b/gpsbabel/stmsdf.cc
@@ -142,10 +142,14 @@ parse_header(char* line)
         case 28: /* X9 TrackLog (Suunto Trek Manager */
           break;
 
+        // 2014-02-11: Added breaks after 78 and 79 as the author "obviously"
+        // meant to treat those as handled.
         case 78:
           prod = "S6 SkiChrono";
+          break;
         case 79:
           prod = "S6 Skilog";
+          break;
 
         default:
           if (prod == NULL) {